r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@bors try jobs=x86_64-gnu-aux

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

☀️ Try build successful (CI)
Build commit: dec0b01 (dec0b01a659033e24d58dc8a50312191a40fd290, parent: f8704be04fe1150527fc2cf21dd44327f0fe87fb)

I think for the failure we saw on beta, you'll have to also set that here:
https://github.com/RalfJung/rust/blob/07a902a84445c32fa8106fb2b2ee44c38d43b4c3/src/ci/docker/host-x86_64/x86_64-gnu-miri/check-miri.sh

I was reproducing that failure on main by setting rust.channel = "beta" and running the command:

$ ./x miri --stage 2 library/core --test-args notest

... which is one of the last commands in that check script, with no MIRIFLAGS at all yet.
(It does work if I add the env-forward for that command though, as expected.)

It might be easier to have bootstrap set/append that to MIRIFLAGS itself, rather than trying to find all the places we call it in CI.

Oh right, we're also invoking ./x miri there...

(It does work if I add the env-forward for that command though, as expected.)

Thanks for confirming!

It might be easier to have bootstrap set/append that to MIRIFLAGS itself, rather than trying to find all the places we call it in CI.

Fair point. I tried that in the latest revision that I just pushed.

cc @Kobzol -- this is probably more like the bootstrap-oriented fix you had in mind.

@cuviper if you still have that setup, could you confirm that with this PR, ./x miri --stage 2 library/core --test-args notest works on the beta channel without manually setting anything?

cc @Kobzol -- this is probably more like the bootstrap-oriented fix you had in mind.

Yes, propagating the env. var. from bootstrap seems generally better than to detect a magical MIRI env. var. in the libtest build script.

if you still have that setup, could you confirm that with this PR, ./x miri --stage 2 library/core --test-args notest works on the beta channel without manually setting anything?

Yes, it works. LGTM, thanks!

@bors r+ rollup

📌 Commit 6b7dbff has been approved by cuviper

It is now in the queue for this repository.